Made a bunch of TODO notes for serious refactoring.