WIP: UseTubeMacro

Change-Id: Idd4fb26b78fce1326b605f6d5df43da3d7b3d9ea