Restructured a bit, still missing some parts under 1.