massive changes.

Signed-off-by: deanevans <dean.mark.evans@gmail.com>