save progress of refactoring (in-progress)
add model specific code