wip
move stuff around, minor tweaks
waa