Created 2D hash for lookups
Updated goals