Finish and refactor rover class