Kiwicon update. Sleep deprived. Almost certainly will be more commits ....