first steps for hit logic
Merge origin/master