committing half-refactored stuff