Implemented some of the requested features.
Added requested features.