Cleared out old scripts - ready for rebuild with lessons learned...
Re-factored for better JSON parsing