Some progress on vn \o/
merge