New skeleton in place. I think it's clear who fills what in.