Update solution_maker; untested
Add solution_maker to upload_worker; untested