Swap to Analytics from Tag Engine

Signed-off-by: markfknight <mark@markfknight.com>