Everything is working just needs cleaning up

The only thing left to do is clean out the comments from my template
and put in new ones