Lots of old stuff that I have forgot to commit :-(