I think I'm done. Time to test with the CLI and then clean up print debugging.