Release 1

Completed by Nicholas C and Roy L