lots of work
adding back files, pre cleanup