Add merge function
Namespace our utility functions
Don't rely on state being immediately updated after setState
WIP on NumHits