New model pull request for code review

this looks like it needs to be some sort of constant reused a few times in this file