Cleaned up new stuff, added UserNotFound exception