moving to a different way to expand -> still some small kinks to work out