Added table functionality and stuff. Not just a JSON output