AutoFill almost there