Black Cat refactor concept by Christiankid7