Now with Celllines and other attributes passing allong correctly to editattribute state