Interim checkin

Things are still unstable, but the samples are working.