Model refactor

Model refactor is a success