Adding first-pass skeleton structure.