split things up, removed templates, etc etc etc