Many changes

Too much to enlist here.
Resolve merge conflicts
Got things working, but auth ain't working :(