Issue #90. Maybe this refactoring is enough. Staring at my iPhone and it is not crashing. Maybe this shit will at least be on fucking commitlogsfromlastnight.com