Working on Main and also finished work on daemon control. Untested