Refactor & transport work