Working on issue #5 and #4 as needed.