added cockroach solver from Michal + refactoring
added new classes