More Work

Looks like we might not need the Residents class