Added diseases

Added diseases, integration of most features