Feature/catalyst admin

Pull request for issues tracking. Not meant to be merged yet.