got some more parts working