sgtm to leave it in scheduler for now and then maybe in the review where storage gets moved to engine just combine the two moves if it makes sense?