Updated to make some useful Class info