new is lame
Add tests for locations
Use json option correctly