Final Complete with Aesthetics

Final working project to merge with Master