Done, except deleting user. Need a lot of testing
Merge branch 'staging' of github.com:itdoors/sd into staging