SDK 2.0 port

Ported to the 2.0 SDK.  Things seem to even work!