BIG REWORK
wip
wip
wip
cleanups
maybe breaking
wip
wip