Massive overhauls to framework, redesign of templates