[WIP]Org edit categories

Putting this up to get comments (especially from @tansaku ).