Move around redraw calls
Rename stuff
Remove TODO