Performed manual merges so ProtectedBlocks and stuff work now!