Fixed linking, next TODO make it work...