one of these days I will do a perfect commit