Added unit testing.  more SQL-like.