Modify as implementation continues