Work on making the current machinery run