Title: Jan's development on master part 1, conflicting with Daves branch
Jan's development on master part 2, conflicting with Daves branch