Implemented all of Brinkman's //TODO memos