Updated a bunch of template stuff. No real code yet.