Number 7 & 8 working, reworked parse

Finished numbers 7 and 8, also reworked parse function to return a
point.