Split things out into different files. Added general full retroactivity.
more progress