STS-872

I took a pass at implementing STS-872