More controller stuff

Signed-off-by: PenguinToast <william@PenguinToast>