Starting to rebuild with the new resistance data model