Worked on the vaccination code some but it is still broken. Did some code cleaning.