More edits; super crappy and non-functional