Not everything is moved yet, this needs a bit more work.
Should make the code actually possible to finish :v