Including the files from web starter kit plus added some changes to work exp