Let me know if this should simply be rolled into the user class instead