WIP: UseTubeMacros

Change-Id: I6420ab38c5b9f627a97f2ff01f9c5f5c011590c7