ADD: Lots of new feature selection code produced over the weekend. Tidied up to work on Riajin