Adds some CLI handling
Removes forgotten print