mosquito season models
general refactoring