Preliminary edits

should have created a new branch to commit from rather than my master. next time...