Move things around, final edits for Marisa