intermediate refactorings to the async handlers in the software plan forms. Also fixes 500 import error