Functionality is there, but UI still needs work
Merge branch 'sector_editor'