Changed auth model, and cleaned up code. Made authentication simpler.