Changes after @vimlondon first talk :D