nearly ready, making UI changes