Big restructure to accomodate global analyses