Put in the core upgrade code (not quite right)
Fix the db upgrade code, finish attribute save.