Implementing some of BulletCalculator and resolving the circular inclusion mess