Make stage scalable. Kinda fixes #23