Changing basic template system. Should be more extenable.
Lets hope it works