Added two new hooks and began integrating them