Address @markijbema + @janpaul123's TODO
Address @markijbema + @janpaul123's TODO

daukantas/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,Factlink/factlink-core