serious refactoring sir! :neckbeard: