Pushing working calendar module before attempting minor fixes