Authentication

Pulling Authentication work into Master. Mostly (90%) complete, still a bunch of refining left to do though.