Refactoring, moving stuff around, updating UI.