Decoupled UI from API, but now UI is (intentionally) broken. Need to add connector.
Fixed merge conflicts