Commit, UI mostly finished