Lot's of changes, first round of UI work.