This is a pretty big commit.

We are changing from 2 pistrap programs to 1. So now all the
functionality that was in 2 programs has been combined here.