I'm not totally clear on which things should be in which file - would you mind commenting a little so I can rearrange?