edited grammar and design files to include what we discussed earlier before forking