Changed the name of the solution to make more sense. Added some more logic around the shell screen.