Close-ish

Issues with cell height still, but everything else functions like I
want.