Controller code is now completely separate from Jarvis