pulling initial logging framework into your branch as well