added all the machine names
subbed in a lot of functionality