Plan for making things a lot more strightforward