Added some OOP coding for dragons