Converted to a csproject and started work on 2.0