commit after niklas merge. Now leaving Git for other collaborators.