Molly - updating some more of the code, adding in people