Many changes, much wow.

Lots of changes!

Signed-off-by: Wessel van der Veen <wesselvanderveen@gmail.com>