More work on the machine and GUI