Reboot of Florian Hufsky's old project