Updated TODO. Properly seperated the average finding app and the standard app