Begin adding size and aspect ratio management.
Simplify Control Flow