models converted to coffee
merge conflict