Added measurements table but not hooked up yet