Start to consolidate everything into Exp