record WIP, moving helpers around
clean up/re-organize user helpers

Convert everything to using shared helpers.