Additional Model

I added some organization underneath the hood to make it easier to add different models. Currently I have a fully naive model, and one with some easy but effective optimization tweaks.