Add some todo's for future investigation
Remove anything that looks like autocomplete