Hapi6 branch [WIP] [Not ready yet]