still working on the container padding kinks
complete merge