clean up.  WIP.  time to add config!
wip
config
wip
wip
wip
update TODO