Moving code from CodePlex