First commit of a "Seems like it works for me" version ;)