Initial work on TORQUE-877