reorganizing a little
ahogue edits