Work on #4 and #5