Machines now part of API.  Close #15