Lots of changes made by ben/david dec 2 in the morning