first pass
wip
working, mostly
misc catchup