Putting this on hold to look at envers