A bunch of changes to the multiparts and new helper methods