Fixed shell and added a TODO
Added join feature to manager