Begin work on fixing gem