Elliots version

have not implemented pictures yet.