More refactoring (8)
More refactoring. All compiler errors gone :smile:

Still tonnes of issues that have to be refixed, sorry :c :smile: :wink: