Nearly production ready (registration). Fixed issues after testing