Upgraded to the latest versions of everything
Ported over some very basic support classes and their tests