Updated code, logging and daemoning still remaining