Gh 855

Lots of stuff in here, but it's looking good.  We want to get this merged and do the rest of the changes in the individual ticket branches.