Update 7 - basic UI, code refactoring, bug fixes