Even more nearly finished

<backblip>

Should be done in a week or so. Now we just need to move all the stuff back in and decide what goes where!