Add Grid Compatibility

Modified to add Grid compatibility. I see that you're working on this already so feel free to use or ignore. Thanks.