Changed selection save and filtering.

Will require re-factoring. Rushed to have functionality available as
quickly as possible.