Moved vim into subclass