I'll let @t3on do a last review and merge