version 1.7

All code written and tests are all working (both sets)

havent finished comments