Make config optional
Add in peer managemen