More progress on boilerplate
Starting testing
Making progress on template files