Moving a lot of stuff over in vcsh