a bit of a merge here
merge complete
started adding parts for the machine