complete rework of internal structure. currently its not yet working again, stay tuned