Added, debugged step 5 class and method extensions