Almost have category selection fixed up. Rewrote the editors and some.