Initial work done to add edit/view capability