Getting ready for some UI improvements.