added a bunch of TODOs to remind me what I want to do next