initial commit - this contains the newest code, including jason's code
from a few hours ago.