some storage changes + progress on records. Constructor is up next
for real this time