Major refactoring dataTransfer mostly in spec now