Actually laid the foundations, that last commit didn't go so well...