Small project refactoring and authentication in progress