Some template refactoring
Trying out user template