A few formatting changes and continuing work on the move function.