[WIP] Authorization, Part 2

WIP