Tidied up classes.
Started on the computer control.