Added missing import.
Big wip.
UPgrading to new protocol.
Updates.