Added incomplete testing - use MuWah's