Added Grahame's updates and synched codebases