continue reorganizing, move stuff earlier