started converting objects to use google's guava library