More work on the Kit Selector and stuff