Finish Merge Issues

Need to fix FindHitPosition Stuff