TODO list should really be moved out of library source