WIP working on getting the template services up to par and wrapping the new ones from old ones.