code: rework to match flippin-tick-thing

Changes are actually pretty dramatic, and tests are out of date.