Merge "Add basic code required for drawPicture()"