Infrastructure changes

made get and take info work with the electrisity needed for the
infrastructure and also added get/set for electricity needed and added
come additional javadoc
Infrastructure tests