Silly newline
Did some refactoring, broke some tests, check_and_return_user is easier to use now