wip
wip cleanup
try to categorize things a bit
even more housecleaning
more wip
even more cleanup
solidify engine abstraction a bit
cleanup some things around the abstract surface