Added registrations objects. Fixed stuff like crazy everywhere. Should have committed sooner.