Initial commit of John's starting point