got quotes to work
added more fields and local refactor