added everything
Merge https://github.com/MichaelvOlst/michaelvanolst