Testing pull, expecting bad stuff
Changes made by Sean Ludtke (sludtke@trihydro.com).
This is our combined code, after thursdays work.

Changes made by Sean Ludtke (sludtke@trihydro.com).