Making progress on GUI, and refactored console