Reverting a lot of changes
Moving to data templating
Completed transition