More work on getting the joins working...