First pass at making the CLI use dynamic alloc
Increased buffers to 64 bytes