Refactored to the calculators
Authentication implemented without specs