Initial implementation of crosshair
Merged conflicts