Cleaned all the swing code out of the model, seems to implement MVC
correctly now