Refactor to get rid of all prints WIP