Some refactoring of the Master
WIP: Working on the frontend