Big vim makeover part 2