Changing order of header to reflect feature priority
Rest of these crappy commits