Refactoring, now actually works