working on using json, and reorganization again