Lots of files moved, more bits and pieces working, still nothing substantial.