Refactoring, cleaning up, changing the way we handle authentication via
hooks