Now handles all types of quotes properly? minor efficiency tweak, slight changes to flow of numbers.
changes to some tests, reimplemented all of the tests