Loki: typelists working
Loki: Fixed merge conflict (Im an idiot and i forget that i had pushed a commit yesterday in another PC...)