~gjabell/vis-fix

Initial commit