Hopefully made this a working set of a shell build