Top-to-bottom refactor of machine requests, imaging is next..