Pull request purely to allow code review by grkvlt

This is not a genuine request to have this work pulled into the cloudsoft repo, and is only being generated to allow code review and feed back.