WIP, needs testing, faster feature adaption possible