Added todos to uncommented classes