More Shell stuff. Not perfect.