Loooooots of refactorings. Trying to make the arch. the cleanest. And with futures everywhere.