template updates import updates, added subjectsn and subject details
started breaking out various objects. new templates, new functions