I don't really expect you to merge this...

...but just so you can take a look at what I have been doing really