Finally working

Time to bloody merge.