Logger added, not working yet. but eventually it will