Started adding functionality.