Finished first pass of Registration functionality