Major patching and UI work