[WIP] - Binary client continues...