shell patch is still buggy but everything else seems to be working correctly