Accepted changes
Stable version. Minor flow issues pending + tying up lose ends.