Finaly added a decent controler

Now there is 1 controler to rule them all