Removed @coenjacobs helpers and cleaned up main clas
Moved template part functions to core functions Closes #3715