Proper drawing stuff
Merge stuff