Updated TODOs, more interesting main