Some more moving around of file before starting some actual work