Added specs to MainModel and resolved some issues within that module