Refactored the code so that we have ActiveCalls and FinishedCalls, ensuring type safety
Resolved merge conflicts
Fixed one of the acceptance tests conflicts.