Finished fixing templates problem. Testing