Totally refactor everything. Redesign UI.
Add a lot of files
merge