Ah, good well-architected code, finally... With most of the code in utils/other :D