Starting work on switching upload to use JSON