Testing

Merged testing branch to master with working client