[WIP] Add phase progress
Workaround weird closure issue :/