new and improved and (final?) schema/relationships