Initial commit, based on Anthony code.