#21 WHOOPS, missed the commit of "the broken code is commented out" file.  Yccheok to fix this and changes can be merged into this.