Work on merging my changes with Jesper's latest