Rearrange + improvements
Working selector functionality, kinda
Much improved selector interface