Much of it finished

I have everything in except for the MSG system. Will submit this, and
then add the MSG system.