initial code commit, not working code mind, but code
cleanup of some template stuff