Added registration (currently broken somehow)