Added some non-tested code. CF Round 224 A.