Another huge set of changes
- started adding user permissions