refactor and autocomplete/re-order work. Still more left.