Fixed initial json upload
Some refactoring
More refactoring
Capified