improved grammar. have yet to change implementation
fixed the tests, now to clean up
final cleanup, now we have a nice saner grammar yay