Got basic updates, now need to curry and collapse