Second round of changes to finish wiring it all together.