Added, debugged step 4 class and method extensions