New commented additions, the templates! Still not working but we'll get there soon