Peacock with Shapes

Add all sorts of odds and ends