working
wip
clean up
more wip
more wip almost done