merge the two draft files

Signed-off-by: Mattias Andrée <maandree@operamail.com>
searching

Signed-off-by: Mattias Andrée <maandree@operamail.com>