Redoing the shell, to better fit the inheritance specifications