Broken RegisterView, still working on it
Further refactor, still broken
Merge master and refactor