Working on defects
Made progress on Get/Set extension