Add more filtering - consolidate some code
Put ageData() logging back in