adding lots of cool new stuff, including Shapes!