Added a bunch of shell classes