Change to a cross dissolve animation
Move some code around, add debugging