Refactor authentication system

Add trackable capabilities for users