Adding transform, started to work on tests