Initial commit.  Back up to p3 functionality, plus added basic search.