the new expander is done-ish