workin' on some more obscure edge cases