TODO test ray and torpedo shud now work