Class Additions

Ready for Merge