Some template shuffling. Removed filter from one template. Added rudimentary registration.