Attn Hivvers: Adopt some CUBs