I think I have finally gotten things in the right order