[WIP] Implenenting cross-aware flow
[WIP] .
[WIP] Works! (Minor tweak needed)