Second attempt, this time better in every way, hopefully?