looking good, need to test quoted strings a bit more