split model setup to different file, added more household progession