Fixed conflicts
Fixed conflicts
Fixed conflicts & start adding new templating
Deleted old template