Updating with decently working layout.  Not even close to V1, but making good progress.