working on isolating UI logic...