You could auto-extend the residence at 18, to make it simpler and more "permanent".