Start of data gathering
Added TODO