Started adding hash list, refactoring.