Basically Done

Done. Fooling around with templates.