First commit

Includes input in basic_client