loads of progress, still just working out the work of DFM with a few goodies