start of refactor
refactoring drawings some more
giving up on this