Patched some mocks and started on Call threads