Issue #1 points 1 and 3 done