Made comparator forms dynamic, no longer dummy