fix deprecation warnings on stubs
move scrivener assertions into lib
WIP progress on base model