Started clearing swing code out of the model and moving it to the view