Implement changes based on code review.  Calls seem to be working but still not updating the UI.