One big commit

Signed-off-by: Alexander Kluth <contact@alexanderkluth.com>