tailo

Sorry its been so long, I have been to busy with work and a new baby in the house to look at splitting the pull request and tidying things up....