Completed the registration features for issue 17.