2nd attempt at new container