added new checks to json file
working, but not pretty yet
working for real this time, still ugly
removed debuggin log statements, still ugly but working