wip
cleanup
wip ... mostly done