Shoved some parts around. Should be a bit easier to assemble.