Started work on quick calculation
Overall added