Finish move. Needs cleanup.