Complete rewrite and ability to join