Re-started implementation of Stage
Should be now in a minimal functioning state