More edits... almost there now