refining

test is passing, but tweaking things, stripping some
out of lib/globals, directly referencing geom_utils, etc