I'll shared co-authoring of this class with you, @lucascs, since there some commits mine here :)