Move some stuff about
fix it so it works