Adding more advanced templating
Adding in basic database hookups
Removing unused template
Formatting