Adding/Enqueueing/etc for new templates and scripts
Added class name and spaces for coding standards
Incomplete check in so I can back up and pick up from another machine
Integrating more of the previous functionality into the Model.