Lots of changes to get closer to having save as draft working. Please, keep working...