extracted the kinetic energy calc into new class. Currently not workin properly
merged files