SPLSAN-5 Testing another commit.

I would like to have this feature's code reviewed, and merged with Master upon passing review.