Editing

WIP, more to come.