Shape

shape tests passing