I gave up dividing my commits for logic units - Viva la revolucion