Work on #133 and #5