Code review

WIP Shell