Compactifications of type II string theory on Calabi-Yau orientifolds offer a promising toolkit for model builders, especially if one includes not only the usual fluxes of NS-NS and R-R field strengths, but also fluxes which are T-dual to the NS-NS three-form flux. These new ingredients are known as metric and non-geometric fluxes, and can improve moduli stabilization or lead to other novel features in four dimensions. I will explain some 10D constructions of these objects, and then describe how they enter the effective N=1 SUGRA theory in 4D giving new contributions to the superpotential and generating D-terms.