Switching to FeatureSpec and starting to reform Week1