TODO's for fix attempts