Added in a lot of ideas for shell