[#538] first pass at the collision angle addition (not finished)

NOT WORKING, but that's all I will be able to do for today, so I prefer
to commit it as it for now.