Added TODO's for filtering and adding tips