Major rebuild started
Still to do:
- New Connection
- Lost Connection
- TEST!!!