working version with all of the UI changes.