Added hash keys.
Resolved merge conflicts.
Resolved conflicts.
Revolved conflicts #2.
Resolved conflicts #3