Made a bunch of revisions and added some stubbed content