work on cleaning up models
simplify models to use our standard example