Move more of the stuff from the general container chain into the application layer so I can refactor it later