post, wip
too much new stuff
merge and fix