New pull req for great goodness

Commits describe themselves