More edits... getting there