Enhancement: Grid Work

For overview sake split into several commits,
will squash if reviewed