Started new branch
Switched to appliance style to ease the workflow