A small bit of re-writting everything.