Adding Laurence changes. Still WIP (BROKEN)