Moved lots around and made a mess, but not so bad.