More progress towards a complete vis; still buggy