Repackaged a lot into vstuff