Finished issue #1, need error checking