Spapp multiple commits to bring it all up to date and move onwards (and upwards)