This is the main thrust of the library. I know it is a lot of changes, but I was running out of time and had to hammer them all in.
