Fixed various oversights and meshed most pieces to work together on a local test driver.