Major Update, constains all new analysis code