Pull request to merge Marty's code.