Refactored Edit

The autocomplete system is smarter now.