more work on new structure. almost there