To do, move to flat file