Made some changes to the loader
Got all templates up and running