added some new shapes

god knows what I've done. Actually not sure if even he/she/they know.
A somewhat working version :)

Fresh start. needs a lot of cleaning and documentation