combine ref files
fix bug creating scoped models
Start implementing model.fn
fix issues in mutators