Alpha version of logging
Merged actual production version into develop