All Updates

Cleaning up and moving calls to connections