Finishing up 1.6.1, moving onto 1.6.2