yeah criteria engine almost done!!!