Masssive refactor, SOIL is now unused