A bit more structure but not there yet.