Changed how shell stuff is sourced