More of removing logic from the shell stuff