Added INNER JOIN logic.  Needs some more work, but it's a start