move code
Refactor add new force calc [work]