Switch everything over to the custom user objects