Tested some more, not totally done yet (MiGrep needs some tweaking)