d-s terms
-p-p and d-s work, but aren't very optimized right now