Simple planner integration and testing

Pulling in changes from simple planner implementation.