Initial refactor for allowing stages instead of only levels, wouh...