Also: - don't pad drawer surround with extra newlines - upcase the drawer surround as per org conventions