Added the stuff we had already planned, and new todo messages for
outstanding issues. Also hopefully removed the .classpath, please make
sure not to accidentally add it again.