add TODOs, make general styling so it's easier to figure out