Implemented the intercept query class, modified p2p query, consolidated the solution factories, and updated the planners' includes.