All Extra Credit Implemented and passing