Load state at the right place
Trying to get joins to work... not quite.