Code now runs

Fixed things so the code itself is now compatible with my new version
of OOP.