switching to using hashes instead of objects
simplifying, removing unnecessary code and functionality