1. Completed json object investigation.
2. Refactoring.