Clay's stuff

Additions to the project by clay