Finally have all roach working