More TODOs, and fixed naming of classes (: