added json
added ability to feed data from json