Massive Changes + Added Json
Massive Changes + Added JSON