Continuing to work through the API advice from Matt Gemmell