Controller starting to look like a real controller