initial commit
fixed conflict
added autocomplete dropdown