#15 Some refactoring and users don't have a stage anymore.