Backend 2.1

Updated as per discussion in the Sprint 1 - Status meeting on 22 April
2014.