Updated where I'm at so that I can work on this from home.