Added logger and started placing outputs here and there