Removed partial implementation errors - ( class is now fully implemented )