Tons of work on stage's types and everything!