0.031

holy shit refactoring (part 1)