Add odds and ends and classes.