Many changes and refactorings, in preparation of devs playing