Finished OOP Wrapper comments