Restructuring complete, a.i deploys successfully. 2-User functionality not yet added