up and running, needs some more cleaning