Update

This is just an update to keep us in sync. I've tidied up all the duplicate files that we discussed, and I'm about halfway through doing up the IM page.