Grits v2

This is an update to PR#116