looks like I didn't commit some changes before we switched to github. This commit has those changes.