Commit with latest changes.
Made some methods private and major changes in Calculations model. Not
finished.

Signed-off-by: Francisco Salinas <fssaez@gmail.com>