Merge madness part deux
Added a waiting screen. Sigh.