halfway through a big overhaul
ha;fway through a big overhaul
still halfway through big overhaul
finished big refactor using general position defs
test commit