Working dev snapshot. Still has unneeded field storage.