Partial update, needs work
Modularize elements, add grid tests