Major updates. See Klok2 on this date.

Signed-off-by: Craig Godfrey <repeater@gmail.com>