got rid of old json, fixed all but collision detection