Move type changes... NEEDS TESTING.