Also, this code looks like a duplicate to what is in /common/ (below). I'd presume there should be a way to have the Sutdio (aka CMS) use the implementation in /common/