Progress on transforming entries, but not done.
Should add some tests for the transforms functions too?