More progress (unstable)

Working on level transition handling