Change models to mixins
Complete programming for issue #2
Remove overhead
Close issue #2