delete TODO
Move stuff around