Renamed stuff, added TODO