Move a lot of helpers from gaku
0.11.0.alpha5