Added functionality to ConnectionManager and added more basic setup