More work to be done here, but getting there