Templates working now