Rearranged the filters to be more coherent.
Some more work done on the saber system.