movestack changes and tests