WIP: UseTubeMacros

Change-Id: I15d016dc4c7904df339eb9ac9ea01346f27f4e74