Feature/admin

Review and merge.