Moved back to a text-field only approach