working but still a bit clunky, getting rid of 1st table next