Refactor
Begin refactoring to include textual GUI and to obey the laws of the great Object