allergy history working
removed many comments
moved some static test to includes