WIP: removing console.log