Add FPS Minimization and test
Change Comparators to use Java Comparator interface