Progress on #7

Tasks 1, 2, 4 are complete