#7: Added basic controllers