-completed seperation of Build and Run