Continue moving functions to stage