Implemented template - initial integration - needs tweaked yet