first version of files.
more fixes
I shouldn't commit these...