Added registering. Hopefully.