More lenses, got rid of rectangle-specific references (mostly) now any shape can be used and lenses grab the necessary info.