Did the post-nensskel TODO items from the readme