#32 - All Methods Implemented but not yet tested