final merge merge

really, this is the final before the update. Really. Maybe.