Pushing for new code

Only pushing this code so I can pull the new stuff.  This isn't
everything that I have so far.