Work on some of the TODO items