Class Additions

Not Ready for Merge