Code merge--baseline for May 6

Many changes—new files—new screens—new code