Renamed some stuff, updated a todo