Cleaned up some templating, several TODOs for registration process