Issue+2+work

Issue 2 work: Jocelyn's