Interim checkin for changes with view rendering. Not done yet.