WIP: UseTubeMacro

Change-Id: I1e7d41f2dde22e45608dc8465a11d6d7f97bc60e