some restructuring in prep for manual tests