Last commit before big UI changes. All system implementations are done. Now we just need server interaction stuff and GUI work