Now can use Controller classes instead of functions (but can still use both...)