Final commit, work done and revised.

Signed-off-by: cderamond <cderamond@gmail.com>