change comments include, to take into account move of files?
add global state changer
add typeahead