Added TODO notes and cleaned up a bit more structure.