Whoops, forgot to include Machine.java in the last commit. Doing that
now.