Added Lion Class and Functionality