Updating to use local classes, and remove plotting front-end.