Wallpost roast 1

Just trying to make small pull requests. This builds on pull request #220 so you need to merge / review that one first.