Intermediate Commit - Working on condensing the multistep plugin into OOP