flesh out new structure a bit