Trying my best to get all this stuff into GIT!  Arrgh.