working on base stuff of the new template