OP zapa
add mihai
Fix bugs on connect
Get it running again