Need to refactor - tomorrow - the gemdir path