More work on the new thing