Orelog graph
Bulk of changes
Merge branch 'new_permissions'