Commit prior to upgrade to sdk 2
Initial SDK 2.0 update for yachtimer