starting refactor
refactor
add all-models dependency
things seem to be mostly working now with a few outstanding TODOs