Add some new writing and rearrange a few things