Adding structure but not yet complete