renamed resident model to residents, added tracks and years