Update after a long absence… still not quite done