Redraw this again - wip

Posting it here so I'll have motivation to finish.