Oct 8-22 commits from robertsoniv/Purchase