Continued work on  and  container
Moved image flipping, rotating functions to