Added preliminary controller support (unfinished)