Started decoupling UI from users selections