bringing stuff over
converting from shell-dev