Almost done port: work on transfering etc class