Abstraction of logic to make filtering easier to manage
Removed reliance on ControlsFX
Merge origin/master
Removed reliance on ControlsFX