Working on opeation models

Fix everything!