Add hook class
lots of pod changes + new hooks layout becoming clearer