begin incorporating persistence
prepare for version 22; slight optimization to database helper