Added class shells for lots of things