'Nother tentative push

Completed hit marking logic