Minor tweeks - This is where I start to remove the JSON