Massive Update

Updated 29 files, changed very little about the actual template engine.