Added some functionalities.  Nothing is really working yet.