Rearranged code and added TODOs for myself and others