Tjtheloner

Just rewriting everything at the moment, that's all