Updated shell

Still needs some work