Add settings controllers stuff
FIX