Updated diary

Now everythings inline, and roughly where it should be