Equipement methods added.  State pattern ?