Revamped most classes not to have cpp, renamed most methdos, bdd still to be done
Simplified calculations