#248, #239 - Added upgrade structure busy check, continuing refactoring, working through issues