Have shorten/expand working.