140818

template refactoring, now uses base template