Adding more functions.  Clicking isn't fully implemented.