Merging files and trying to get inline with the tutorial. Currently www is working.