Add new join method, add ability to do multiple wheres