Second Commit to Container Controller
Changed architecture, prone to change!