Commit Two

Got it working with a search box - well, when I say "working", I might
be exaggerating a little.