Added everything before FOG

the issue we had before was the install of fog. So I have saved
everything that is working up to this point. Fog will be installed
after this commit and push.