Move refactor to models from private repo to here

[Jyckle]

My branch to refactor to using a more model-centric strategy is currently still in work, and only on the private repo. It should be transitioned here as soon as possible.