Proper namespacing
Started scaffolding out some templates
Fixing silly mistakes