Fresh start with code updates

Check in Allison's code, then update to code from old computer (known to
work on this rig)