Changed a lot of junk.  This does NOT work though.  Do not use this commit.