Fixed a bunch of templating nonsense, this is almost getting close to being done.