Added all the new factors, everythings broken