incremental wip, cleanup/refactor
cleanup wip