basic refactor to georgeludwigtech package