Order class should now be correct